Auto merge of #2037 - honorabrutroll:master, r=alexcrichton

Addresses issue #376 by checking the compilation mode before printing.

diff --cc tests/test_cargo_compile_custom_build.rs
index b37dd1ae0c23172033812d498a24300de0eb88a0,e21718a22a3a6c62365cbb87bc690953a86384bd..044835f3d296560a8835427c24d94ef826829fcb
--- 1/tests/test_cargo_compile_custom_build.rs
--- 2/tests/test_cargo_compile_custom_build.rs
+++ b/tests/test_cargo_compile_custom_build.rs
@@@ -2,9 -2,9 +2,9 @@@ use std::fs::File
  use std::io::prelude::*;
  
  use support::{project, execs};
- use support::{COMPILING, RUNNING, DOCTEST, FRESH};
+ use support::{COMPILING, RUNNING, DOCTEST, FRESH, DOCUMENTING};
  use support::paths::CargoPathExt;
 -use hamcrest::{assert_that};
 +use hamcrest::{assert_that, existing_file, existing_dir};
  
  fn setup() {
  }

diff --cc tests/test_cargo_doc.rs
Simple merge